Merge tag 'upstream/2.11'
authorgregor herrmann <gregoa@debian.org>
Tue, 13 May 2014 20:05:45 +0000 (22:05 +0200)
committergregor herrmann <gregoa@debian.org>
Tue, 13 May 2014 20:05:45 +0000 (22:05 +0200)
commite5835cf4c2f88b7c91eb3ef5a2192763ceb7e534
tree4718d9c8db62b8dcd60de778a44079cbd626673f
parente5cbdde11165e3a392784bd406364e352ca63871
parent353becbb87b67556dc632b73c7773fb2c4c4450f
Merge tag 'upstream/2.11'

Upstream version 2.11